Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootctrl: fall back to active slot if current slot not found in cmdline #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

a-wai
Copy link

@a-wai a-wai commented Aug 28, 2024

While postmarketOS makes use of a kernel cmdline argument, this isn't the case for all distros. Furthermore, this argument isn't present in those added automatically by the Android bootloader.

In order to still be able to use qbootctl on other distros, this change ensures we use the currently active slot as the current slot when the cmdline argument is missing. This ensure qbootctl -m picks up the correct slot more often than not, instead of always defaulting to _a.

While postmarketOS makes use of a kernel cmdline argument, this isn't
the case for all distros. Furthermore, this argument isn't present in
those added automatically by the Android bootloader.

In order to still be able to use `qbootctl` on other distros, this
change ensures we use the currently active slot as the current slot when
the cmdline argument is missing. This ensure `qbootctl -m` picks up the
correct slot more often than not, instead of always defaulting to `_a`.
@calebccff
Copy link
Member

Sorry i totally missed this PR!

Not sure how motivated you are still with this, the diff needs fixing (is it necessary to move the function?) and I think it would make sense to adjust the function name to reflect the fallback behaviour.

I can also make these changes while merging given the timespan...

@a-wai
Copy link
Author

a-wai commented Feb 12, 2025

is it necessary to move the function?

Well it has to know about get_active_boot_slot(), defined on L541. The alternative being a forward declaration of the latter, I'm fine with either solution.

and I think it would make sense to adjust the function name to reflect the fallback behaviour.

Sure, do you have something specific in mind? get_current_or_active_slot? get_current_from_cmdline_or_active?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants